From: Alan Mackenzie <acm@muc.de>
Date: Sat, 5 Dec 2009 11:16:04 +0000 (+0000)
Subject: Revert change 1.85
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~9073
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=233d59df36c9991897fa34357c987dfc562d27e9;p=emacs.git

Revert change 1.85
---

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 634d0989355..49d9ebeb492 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -673,7 +673,7 @@ This function is called from the hook `before-hack-local-variables-hook'."
 	  (offsets (cdr (assq 'c-file-offsets file-local-variables-alist))))
       (when stile
 	(or (stringp stile) (error "c-file-style is not a string"))
-	(c-set-style stile t))
+	(c-set-style stile))
       (when offsets
 	(mapc
 	 (lambda (langentry)
@@ -744,7 +744,7 @@ Note that the style variables are always made local to the buffer."
     (when c-file-style
       (or (stringp c-file-style)
 	  (error "c-file-style is not a string"))
-      (c-set-style c-file-style t))
+      (c-set-style c-file-style))
 
     (and c-file-offsets
 	 (mapc